(viper-file-checked-in-p): Use `and'

instead of `progn'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2cb05fc7fba936f392bd9c89e12996881c7f3aa9..a6ee9c8cbb7070fd9a8245a65fc7875c58cfce25 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2001-08-07  Gerd Moellmann  <gerd@gnu.org>
 
+       * emulation/viper-util.el (viper-file-checked-in-p): Use `and'
+       instead of `progn'.
+
        * tar-mode.el (tar-extract): Avoid generating a new buffer
        for each file visited.  From Markus Rost <rost@math.ohio-state.edu>.
 

diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index cacd8debd4693bd161b320680c6a95b1db844001..f5d4eb355abf6510deed9f4f0a674e333991aec5 100644 (file)
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -694,7 +694,7 @@
        ;; CVS files are considered not checked in
        (not (memq (vc-backend file) '(nil CVS)))
        (if (fboundp 'vc-state)
-          (progn
+          (and
             (not (memq (vc-state file) '(edited needs-merge)))
             (not (stringp (vc-state file))))
         ;; XEmacs has no vc-state